(read_key_sequence):

Use meta_modifier for meta keys when handling function_key_map.

diff --git a/src/keyboard.c b/src/keyboard.c
index a1a0fc536fd75d848937af547d0c8db0985d58bc..6c664169f0346e65470b4dfef2e60fdb9fdc47bb 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -3498,7 +3498,7 @@ read_key_sequence (keybuf, bufsize, prompt)
              key = keybuf[fkey_end++];
              /* Look up meta-characters by prefixing them
                 with meta_prefix_char.  I hate this.  */
-             if (XTYPE (key) == Lisp_Int && XINT (key) & 0x80)
+             if (XTYPE (key) == Lisp_Int && XINT (key) & meta_modifier)
                {
                  fkey_next =
                    get_keymap_1
@@ -3506,7 +3506,7 @@ read_key_sequence (keybuf, bufsize, prompt)
                       (access_keymap
                        (fkey_map, meta_prefix_char, 1)),
                       0, 1);
-                 XFASTINT (key) = XFASTINT (key) & 0x7f;
+                 XFASTINT (key) = XFASTINT (key) & ~meta_modifier;
                }
              else
                fkey_next = fkey_map;